Fix an oversight
authorMatthias Clasen <mclasen@redhat.com>
Fri, 30 Jan 2015 23:42:06 +0000 (18:42 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 30 Jan 2015 23:42:06 +0000 (18:42 -0500)
Commit ff256956b2072cd422 introduced a frame_clock_events_paused
flag, but only ever set it to TRUE, instead of unsetting it when
events are resumed. This was leading to assertion failures in
_gdk_display_unpause_events().

gdk/gdkwindow.c

index a12a43e1e55a7aaa60bbf95943d67f9157862524..974c43241d898dc2f096e9583a4b13db05b27ba8 100644 (file)
@@ -10942,7 +10942,7 @@ gdk_window_resume_events (GdkFrameClock *clock,
   display = gdk_window_get_display (window);
   _gdk_display_unpause_events (display);
 
-  window->frame_clock_events_paused = TRUE;
+  window->frame_clock_events_paused = FALSE;
 }
 
 static void
@@ -10976,9 +10976,7 @@ gdk_window_set_frame_clock (GdkWindow     *window,
   if (window->frame_clock)
     {
       if (window->frame_clock_events_paused)
-        {
-          gdk_window_resume_events (window->frame_clock, G_OBJECT (window));
-        }
+        gdk_window_resume_events (window->frame_clock, G_OBJECT (window));
 
       g_signal_handlers_disconnect_by_func (G_OBJECT (window->frame_clock),
                                             G_CALLBACK (gdk_window_flush_events),